Skip to content

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented May 7, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 12 commits May 3, 2019 00:13
`<-` may indicate the start of a negative const argument.
…QuietMisdreavus

Remove hamburger button from source code page

Fixes rust-lang#60483.

Screenshot:

<img width="575" alt="Screenshot 2019-05-03 at 00 12 51" src="https://user-images.githubusercontent.com/3050060/57110298-61ec8f00-6d38-11e9-85fd-d13be94b9c52.png">

cc @rust-lang/rustdoc
Rename `ParamTy::idx` to `ParamTy::index`

This makes it consistent with `ParamConst` and `EarlyBoundRegion`.
…trochenkov

Fix parsing issue with negative literals as const generic arguments
…ce-doc, r=Centril

Be a bit more explicit asserting over the vec rather than the len
@Centril
Copy link
Contributor Author

Centril commented May 7, 2019

@bors r+ p=5

@bors
Copy link
Collaborator

bors commented May 7, 2019

📌 Commit 2d6da83 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 7, 2019
@bors
Copy link
Collaborator

bors commented May 7, 2019

⌛ Testing commit 2d6da83 with merge cfdc84a...

bors added a commit that referenced this pull request May 7, 2019
Rollup of 5 pull requests

Successful merges:

 - #60489 (Remove hamburger button from source code page)
 - #60535 (Correct handling of arguments in async fn)
 - #60579 (Rename `ParamTy::idx` to `ParamTy::index`)
 - #60583 (Fix parsing issue with negative literals as const generic arguments)
 - #60609 (Be a bit more explicit asserting over the vec rather than the len)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented May 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing cfdc84a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 7, 2019
@bors bors merged commit 2d6da83 into rust-lang:master May 7, 2019
@Centril Centril deleted the rollup-61drhqt branch May 7, 2019 22:34
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants